Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Forward-merge branch-24.08 to branch-24.10 #16813

Merged
merged 15 commits into from
Sep 20, 2024
Merged

Forward-merge branch-24.08 to branch-24.10 #16813

merged 15 commits into from
Sep 20, 2024

Conversation

bdice
Copy link
Contributor

@bdice bdice commented Sep 17, 2024

Manual forward merge from 24.08 to 24.10. This PR should not be squashed.

wence- and others added 2 commits September 16, 2024 20:17
@wence- @lithomas1
@davidwendt @brandon-b-miller @vyasr @bdice @singhmanas1
Creation of CI artifacts for cudf-polars wheels (rapidsai#16680)
2607537 
This is the changes that will be in the cudf-polars point release.

---------

Co-authored-by: Thomas Li <[email protected]>
Co-authored-by: David Wendt <[email protected]>
Co-authored-by: brandon-b-miller <[email protected]>
Co-authored-by: Vyas Ramasubramani <[email protected]>
Co-authored-by: brandon-b-miller <[email protected]>
Co-authored-by: Bradley Dice <[email protected]>
Co-authored-by: Manas Singh <[email protected]>
Co-authored-by: Manas Singh <[email protected]>
@bdice
Merge branch-24.08 into branch-24.10
1f40520
@bdice bdice added the improvement Improvement / enhancement to an existing function label Sep 17, 2024
@bdice bdice requested a review from a team as a code owner September 17, 2024 00:52
@bdice bdice added the non-breaking Non-breaking change label Sep 17, 2024
@bdice bdice requested review from a team as code owners September 17, 2024 00:52
@github-actions github-actions bot added Python Affects Python cuDF API. CMake CMake build issue cudf.polars Issues specific to cudf.polars labels Sep 17, 2024
brandon-b-miller
brandon-b-miller reviewed Sep 17, 2024
View reviewed changes
ci/test_wheel_cudf_polars.sh
@@ -43,6 +47,9 @@ python -m pip install \
"$(echo ./dist/libcudf_${RAPIDS_PY_CUDA_SUFFIX}*.whl)" \
"$(echo ./dist/pylibcudf_${RAPIDS_PY_CUDA_SUFFIX}*.whl)"

rapids-logger "Pin to 1.7.0 Temporarily"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this can be removed now

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would do those changes in a follow-up PR where we unpin and also change the xfail/xpass status of that one test we discussed.

@bdice bdice mentioned this pull request Sep 17, 2024
Merged
3 tasks
wence-
wence- requested changes Sep 19, 2024
View reviewed changes
Copy link
Contributor

@wence- wence- left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @bdice, I think the failures can be fixed by my suggestions, will try it out.

python/cudf_polars/cudf_polars/dsl/translate.py Outdated Show resolved Hide resolved
ci/test_cudf_polars_polars_tests.sh Outdated Show resolved Hide resolved
@bdice
Copy link
Contributor Author

bdice commented Sep 19, 2024

Oh, more merge conflicts! I'll resolve again.

@bdice
Copy link
Contributor Author

bdice commented Sep 19, 2024

@mroeschke Can you please let this PR go through before merging any more pylibcudf changes?

Or should we run CI locally on this and admin-merge it to avoid further delay?

cc: @wence- @vyasr

wence-
wence- reviewed Sep 20, 2024
View reviewed changes
.github/workflows/pr.yaml Outdated Show resolved Hide resolved
wence-
wence- approved these changes Sep 20, 2024
View reviewed changes
Copy link
Contributor

@wence- wence- left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I merged 24.10 and updated the workflow to point back to branch-24.10 (rather than python-3.12). From my side this looks good.

@wence-
Copy link
Contributor

wence- commented Sep 20, 2024

And the linting issues

@wence-
Copy link
Contributor

wence- commented Sep 20, 2024

Update set of xfailing tests in polars test suite (we are passing two more tests...)

msarahan
msarahan reviewed Sep 20, 2024
View reviewed changes
ci/test_cudf_polars_polars_tests.sh
Comment on lines +36 to +37
# TAG=$(python -c 'import polars; print(f"py-{polars.__version__}")')
TAG="py-1.7.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# TAG=$(python -c 'import polars; print(f"py-{polars.__version__}")')
TAG="py-1.7.0"
TAG=$(python -c 'import polars; print(f"py-{polars.__version__}")')

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we're waiting to unpin this until a follow-up PR. This PR just needs to forward-merge the current state from 24.08 and we'll unpin/fix the associated problems on branch-24.10.

msarahan
msarahan approved these changes Sep 20, 2024
View reviewed changes
Copy link
Contributor

@msarahan msarahan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other than the comments about the temporary pinning, this is fine.

@bdice
Copy link
Contributor Author

bdice commented Sep 20, 2024

We need this in branch-24.10 to unblock other work needed for burndown / code freeze. Getting this in ASAP will mitigate risk further down the line, so I am going to run the polars CI job locally once builds complete, and then request an admin-merge (everything else passed last run).

@wence- wence- mentioned this pull request Sep 20, 2024
Merged
3 tasks
@bdice bdice added the 5 - DO NOT MERGE Hold off on merging; see PR for details label Sep 20, 2024
@bdice
Copy link
Contributor Author

bdice commented Sep 20, 2024 •
edited
Loading

I probably won't need to admin-merge this, it looks like CI is running now (as my local CI run is running, too). But it'll still need ops to help non-squash-merge this, so I'm marking DO NOT MERGE.

@AyodeAwe AyodeAwe merged commit eeb4bae into rapidsai:branch-24.10 Sep 20, 2024
98 of 99 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@brandon-b-miller brandon-b-miller brandon-b-miller left review comments

@wence- wence- wence- approved these changes

@msarahan msarahan msarahan approved these changes

@isVoid isVoid Awaiting requested review from isVoid isVoid is a code owner automatically assigned from rapidsai/cudf-python-codeowners

Assignees
No one assigned
Labels
5 - DO NOT MERGE Hold off on merging; see PR for details CMake CMake build issue cudf.polars Issues specific to cudf.polars improvement Improvement / enhancement to an existing function non-breaking Non-breaking change Python Affects Python cuDF API.
Projects
cuDF Python
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@bdice @wence- @msarahan @brandon-b-miller @AyodeAwe